From: Chris Foote Date: Mon, 23 Aug 2010 00:44:55 +0000 (-0400) Subject: * progmodes/python.el (python-block-pairs): Allow use of "finally" with "else" (Bug... X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~512 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a1583c219a033f1a8b91782377c86104d14aeae3;p=emacs.git * progmodes/python.el (python-block-pairs): Allow use of "finally" with "else" (Bug#3991). --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ba8a90625b0..f7fbdea9570 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-08-23 Chris Foote (tiny change) + + * progmodes/python.el (python-block-pairs): Allow use of "finally" + with "else" (Bug#3991). + 2010-08-22 Leo * net/rcirc.el (rcirc-add-or-remove): Accept a list of elements. diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2b09e346331..ed2a3236be1 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -755,7 +755,7 @@ Set `python-indent' locally to the value guessed." '(("else" "if" "elif" "while" "for" "try" "except") ("elif" "if" "elif") ("except" "try" "except") - ("finally" "try" "except")) + ("finally" "else" "try" "except")) "Alist of keyword matches. The car of an element is a keyword introducing a statement which can close a block opened by a keyword in the cdr.")